From 7ef0d92af916bcf1d97c441d401953b36df5269e Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Thu, 12 May 2005 15:02:52 +0000 Subject: [PATCH] bitkeeper revision 1.1389.1.49 (4283701cNLgzy29rE9Sw2-Jbp4DdZA) Remove 'exec_domain' from Xen public interfaces. Replace with 'vcpu'. Signed-off-by: Keir Fraser --- tools/libxc/xc_domain.c | 8 ++++---- tools/libxc/xc_linux_build.c | 6 +++--- tools/libxc/xc_linux_restore.c | 6 +++--- tools/libxc/xc_plan9_build.c | 2 +- tools/libxc/xc_private.c | 4 ++-- tools/libxc/xc_ptrace.c | 8 ++++---- tools/libxc/xc_vmx_build.c | 6 +++--- xen/include/public/dom0_ops.h | 8 ++++---- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index ed0149c60d..345af149f2 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -91,8 +91,8 @@ int xc_domain_pincpu(int xc_handle, { dom0_op_t op; op.cmd = DOM0_PINCPUDOMAIN; - op.u.pincpudomain.domain = (domid_t)domid; - op.u.pincpudomain.exec_domain = vcpu; + op.u.pincpudomain.domain = (domid_t)domid; + op.u.pincpudomain.vcpu = vcpu; op.u.pincpudomain.cpumap = cpumap; return do_dom0_op(xc_handle, &op); } @@ -156,8 +156,8 @@ int xc_domain_get_vcpu_context(int xc_handle, op.cmd = DOM0_GETVCPUCONTEXT; op.u.getvcpucontext.domain = (domid_t)domid; - op.u.getvcpucontext.exec_domain = (u16)vcpu; - op.u.getvcpucontext.ctxt = ctxt; + op.u.getvcpucontext.vcpu = (u16)vcpu; + op.u.getvcpucontext.ctxt = ctxt; if ( (ctxt != NULL) && ((rc = mlock(ctxt, sizeof(*ctxt))) != 0) ) diff --git a/tools/libxc/xc_linux_build.c b/tools/libxc/xc_linux_build.c index 364453190d..84e99e9457 100644 --- a/tools/libxc/xc_linux_build.c +++ b/tools/libxc/xc_linux_build.c @@ -457,9 +457,9 @@ int xc_linux_build(int xc_handle, memset( &launch_op, 0, sizeof(launch_op) ); - launch_op.u.setdomaininfo.domain = (domid_t)domid; - launch_op.u.setdomaininfo.exec_domain = 0; - launch_op.u.setdomaininfo.ctxt = ctxt; + launch_op.u.setdomaininfo.domain = (domid_t)domid; + launch_op.u.setdomaininfo.vcpu = 0; + launch_op.u.setdomaininfo.ctxt = ctxt; launch_op.cmd = DOM0_SETDOMAININFO; rc = do_dom0_op(xc_handle, &launch_op); diff --git a/tools/libxc/xc_linux_restore.c b/tools/libxc/xc_linux_restore.c index 6442e3926a..5374ffd3a5 100644 --- a/tools/libxc/xc_linux_restore.c +++ b/tools/libxc/xc_linux_restore.c @@ -634,9 +634,9 @@ int xc_linux_restore(int xc_handle, XcIOContext *ioctxt) xcio_info(ioctxt, "Domain ready to be built.\n"); op.cmd = DOM0_SETDOMAININFO; - op.u.setdomaininfo.domain = (domid_t)dom; - op.u.setdomaininfo.exec_domain = 0; - op.u.setdomaininfo.ctxt = &ctxt; + op.u.setdomaininfo.domain = (domid_t)dom; + op.u.setdomaininfo.vcpu = 0; + op.u.setdomaininfo.ctxt = &ctxt; rc = do_dom0_op(xc_handle, &op); if ( rc != 0 ) diff --git a/tools/libxc/xc_plan9_build.c b/tools/libxc/xc_plan9_build.c index ab8886a5d3..bfa5ccdf33 100644 --- a/tools/libxc/xc_plan9_build.c +++ b/tools/libxc/xc_plan9_build.c @@ -543,7 +543,7 @@ xc_plan9_build(int xc_handle, memset(&launch_op, 0, sizeof (launch_op)); launch_op.u.setdomaininfo.domain = (domid_t) domid; - launch_op.u.setdomaininfo.exec_domain = 0; + launch_op.u.setdomaininfo.vcpu = 0; // launch_op.u.setdomaininfo.num_vifs = 1; launch_op.u.setdomaininfo.ctxt = ctxt; launch_op.cmd = DOM0_SETDOMAININFO; diff --git a/tools/libxc/xc_private.c b/tools/libxc/xc_private.c index 550989e3e0..0645af7a91 100644 --- a/tools/libxc/xc_private.c +++ b/tools/libxc/xc_private.c @@ -175,8 +175,8 @@ long long xc_domain_get_cpu_usage( int xc_handle, domid_t domid, int vcpu ) op.cmd = DOM0_GETVCPUCONTEXT; op.u.getvcpucontext.domain = (domid_t)domid; - op.u.getvcpucontext.exec_domain = (u16)vcpu; - op.u.getvcpucontext.ctxt = NULL; + op.u.getvcpucontext.vcpu = (u16)vcpu; + op.u.getvcpucontext.ctxt = NULL; if ( (do_dom0_op(xc_handle, &op) < 0) ) { PERROR("Could not get info on domain"); diff --git a/tools/libxc/xc_ptrace.c b/tools/libxc/xc_ptrace.c index ca051fab97..f465f1e085 100644 --- a/tools/libxc/xc_ptrace.c +++ b/tools/libxc/xc_ptrace.c @@ -311,8 +311,8 @@ xc_ptrace(enum __ptrace_request request, u32 domid, long eaddr, long edata) op.cmd = DOM0_SETDOMAININFO; SET_XC_REGS(((struct gdb_regs *)data), ctxt[VCPU].user_regs); op.u.setdomaininfo.domain = domid; - /* XXX need to understand multiple exec_domains */ - op.u.setdomaininfo.exec_domain = cpu; + /* XXX need to understand multiple vcpus */ + op.u.setdomaininfo.vcpu = cpu; op.u.setdomaininfo.ctxt = &ctxt[cpu]; retval = do_dom0_op(xc_handle, &op); if (retval) @@ -340,7 +340,7 @@ xc_ptrace(enum __ptrace_request request, u32 domid, long eaddr, long edata) ctxt[VCPU].user_regs.eflags |= PSL_T; op.cmd = DOM0_SETDOMAININFO; op.u.setdomaininfo.domain = domid; - op.u.setdomaininfo.exec_domain = 0; + op.u.setdomaininfo.vcpu = 0; op.u.setdomaininfo.ctxt = &ctxt[cpu]; retval = do_dom0_op(xc_handle, &op); if (retval) { @@ -357,7 +357,7 @@ xc_ptrace(enum __ptrace_request request, u32 domid, long eaddr, long edata) ctxt[cpu].user_regs.eflags &= ~PSL_T; op.cmd = DOM0_SETDOMAININFO; op.u.setdomaininfo.domain = domid; - op.u.setdomaininfo.exec_domain = cpu; + op.u.setdomaininfo.vcpu = cpu; op.u.setdomaininfo.ctxt = &ctxt[cpu]; retval = do_dom0_op(xc_handle, &op); if (retval) { diff --git a/tools/libxc/xc_vmx_build.c b/tools/libxc/xc_vmx_build.c index 32c9a14786..1edb8dc997 100644 --- a/tools/libxc/xc_vmx_build.c +++ b/tools/libxc/xc_vmx_build.c @@ -623,9 +623,9 @@ int xc_vmx_build(int xc_handle, memset( &launch_op, 0, sizeof(launch_op) ); - launch_op.u.setdomaininfo.domain = (domid_t)domid; - launch_op.u.setdomaininfo.exec_domain = 0; - launch_op.u.setdomaininfo.ctxt = ctxt; + launch_op.u.setdomaininfo.domain = (domid_t)domid; + launch_op.u.setdomaininfo.vcpu = 0; + launch_op.u.setdomaininfo.ctxt = ctxt; launch_op.cmd = DOM0_SETDOMAININFO; rc = do_dom0_op(xc_handle, &launch_op); diff --git a/xen/include/public/dom0_ops.h b/xen/include/public/dom0_ops.h index 734b7c5667..430244d220 100644 --- a/xen/include/public/dom0_ops.h +++ b/xen/include/public/dom0_ops.h @@ -95,7 +95,7 @@ typedef struct { typedef struct { /* IN variables. */ domid_t domain; - u16 exec_domain; + u16 vcpu; /* IN/OUT parameters */ vcpu_guest_context_t *ctxt; } dom0_setdomaininfo_t; @@ -171,13 +171,13 @@ typedef struct { } dom0_readconsole_t; /* - * Set which cpus an exec_domain can use + * Set which physical cpus a vcpu can execute on. */ #define DOM0_PINCPUDOMAIN 20 typedef struct { /* IN variables. */ domid_t domain; - u16 exec_domain; + u16 vcpu; cpumap_t *cpumap; } dom0_pincpudomain_t; @@ -346,7 +346,7 @@ typedef struct { #define DOM0_GETVCPUCONTEXT 37 typedef struct { domid_t domain; /* domain to be affected */ - u16 exec_domain; /* vcpu # */ + u16 vcpu; /* vcpu # */ vcpu_guest_context_t *ctxt; /* NB. IN/OUT variable. */ u64 cpu_time; } dom0_getvcpucontext_t; -- 2.30.2